Fixed Tests suite for Edm.
Upgraded uses of Zend Framework 2 to 2.1.5.