Working tests for 3.1.1 assumption 1 case 1 and case 2, which is idem to 3.2.3 assumption 2.
Also some small cleanups