Added test classes