improvement in unit test suite