Added more test classes