(I hope) tests are fixed, issue #1386