Is there an opportunity here to remove some of the acceptance tests? Or shall we create a new ticket to track that effort.