test functions unified and updated
Authored by: cfschneider 2014-01-08
Parent: [r1144]
Child: [r1146]