fix tests, add additional overrides to deferred methods