re-organize the test file