cleanup and make tests work with Mojolicious >= 5