#987 Max: Update and create new tests.