Fixed all the tests (Rob)