Fixing tests that broke due to changing field arguments