added Solution and SolutionTest