Fix the tests. Remove Collections from the solution.