tests: reorganized ReturnTest