Kvh/tests passing

@johnmcdonnell cleaned a few things up, tests are passing, no major API changes