Fixing tests to work =P