Fixing tests that were using previous fields