Amended tests, removed zip packages, 2013.