WIP commit with in-progress better groovy testing impl

Change-Id: Ibe9d115fa89a037232cd040d5cd0c049e23665c7
7 files changed