Handle non-public default constructors
Make behavior of mapping consistant between methods and fields, and handle conflicts between underscores and no underscores by picking the most exact match
Depend on latest version of junit and change junit dependency in beehive-controls to provided for the one abstract test case in there