Re-fix the tests..