Re structuring test suite