Updated as an implicit, and updated the tests with the cleaner workflow that results