Fix not passing tests