*Minor changes based on first very basic test
Authored by: pmraps 2015-07-28
Parent: [r88]
Child: [r90]