Tidy Lauter, improve test coverage