AG: started updates to testing