Updated tests to ~100% coverage.