WIP: MockMvc tests for switching zones