Cleanup help code and add tests