Merge "Update zipapex tests to run fully out of the zipapex"