Add test classes