refactored a little logic and gutted the tests... will need to see if I
can make a statsd server for testing