Trim a few dozen lines from the unit tests while we're at it