Fixing tests to work with newest save