Updated tests and solution to make them pass