Testworks fixes