Renamed macros
added more test units
added zone parsing test units