Don't skip the tests anymore
Add DRY bottles solution