Writing tests for 1.07
Merge tag '1.07' into COMPOR