#673 - refactor to remove dependence on SpringApplicationContext
#673 - test development