Updated tests to pass