Most of the tests working...