More updates to testing