[WIP] Updated ZF test and changed another class's name
[WIP] All tests are finished (100% cc). A few minor fixes and renames.