Update to test classes that were giving errors