DATACOUCH-19 - Further test tweaks.