Minor fixes to test classes