got the tests working kind of