Added test files
Updated class structure