Adding more test coverage, squash later.