merge tax and zone tests