Updated System Test controller with some extra information useful for testing
Merge remote-tracking branch 'origin/master'