Updated testworks.
Merge pull request #589 from BarAgent/master

Updated testworks.