Fixes lizard-progress #66, adds a test for lizard-progress #69