Adding classes and test classes