moving all entry generation into the handlers, begin unit testing default handler