Updated tests, all tests green