Updated the UI and added a downstream test