Migrating to zf2
Fixed unit tests
Fixed the remaining broken tests