Fixing the tests (actually the code).