Made test cases work