Added many test classes