CON-1813 make tests more awesome