Added solution and test files