Improved test coverage of codebase.