Test suite tweaks to accomodate quirkiness