#457 Add tests, fix problems.

4 jobs for 457-more-general-invariants-checker in 0 seconds (queued for 34 seconds)