Updated test classes and test dependencies