Updated tests to all pass