Merge "Revert "Expand Gatekeeper test""