Fixed test for empty zonenames.
Merge branch 'test' into dev