Fixing tests..