Fixing tests in progress