Cleanup some test utils
Remove some redundant test files
Do not wrap "variants" in arrays when unmarshalling.