Fixing tests to pass