More spec refactors