allow skipping zone generation phase; add a bunch of (failing) tests