I found these tests only _after_ the previous changes, so I needed to merge and/or remove redundant tests.