Matthijs Mekking authored Apr 05, 2019 and Mark Andrews committed Apr 10, 2019

This also fixes a bug in the tests ($n was not incremented in one
place).