Add test classes and todos