More updates to testing and visualisation