Finalize test enhancements

6 jobs for feature/improvement-tests in 12 minutes (queued for 4 seconds)