Fix detection of when to exclude no_ci tests
Let some specs run under ci that wouldn't previously
Tweaks for feature stability and readability