Adding tests, more coverage
Adding test coverage.