Updated tests with more coverage.