Merge "Improve unit tests for subunit_describe_calls"