Respecting `allowLocal` & refactoring tests