#987 Min: Update and create new tests.