Fixed 2 more test classes