rearrange some test case stuff