little refactor of body generator tests