Modified into one test suite