Added Generic Test Suite