Updated tests
Set zf to 2.2.*