added more test classes