Consistency test 2

A continuation of #64 that was rebased against master.