Added multi-zone test classes.