Refactors Zeller and some unit tests.