#15 Minor tweaks to bulk test