Added test classes for this branch