Updated test classes