Fixing tests to work with field injection instead of parameter injection