converting more code & start converting test helpers to zf2