Fixing tests :S