test refactors, 99% total coverage on everything but droxi.rb