Added empty test method, rearranged Zone methods