Add/Fix tests for better test coverage.