Writing tests for 1.07
Merge tag '1.07' into OO
Implementation: Writing tests for 1.07.