test-lib: rearrange start/end of test_expect_* and test_skip