Adding classes and test files