completing 2012 goal of 90%+ test coverage. also much cleanup