Merge "increased test coverage"