got all the tests working