Fixed passing of all tests