Additional updates and tests

@robinator, it would be reasonable to leave off the tests from this pull request -- especially since so many of them are still pending -- that would reduce the size of this merge significantly