ZF-3667: Resolve problems showed by unit tests

Description

Comments

Done.