Added more unit tests to fill out coverage.