Added more test cases, minor wording changes
Authored by: mtrute 2017-12-16
Parent: [r4]
Child: [r6]
