test suite modified to separate tests between different files