Added classes and test files