Tests

Fix all the tests.