Fix tests for removed methods