Issue 506 - Sparking ✨ joy ✨ by running fewer tests (26)