refactor of rabbit test