unit test coverage increased for performance/load