Patching broken tests so they compile