Added class and test files