Rearranged unit tests into test suites