Added new test classes