Up Test Coverage

Lots of little fixes for test coverage.