updates for test suite