Test automation fw upgrade

Updated to latest version of the Scala test fw. This includes a fix for overriding system properties which is needed for team city.