Fix for broken tests due to changes when upgrading to zf2.1