TS-1819 Also make the new tests build on all platforms
TS-1792 Cleanup debug around vary headers
Fixed some formatting. Also added TS-1792