Minor tweaks to tests (one actual fix on line 137)