Re-organize test suite