Added more tests with different zones