Update method swizzling approaches in tests consistently