Fixed some bags in TestClass