Adding solution and test files for problem2