More spec support cleanup
Speeding up specs a bit