modernize test suite