Added generic test suite