james | further improvements to rabbit test