Rearrange unit-test file