adding test coverage, cleaning up some silly exports