fix generic test suite