little refactoring to specs
Merge branch 'combined-specs' of https://github.com/jstaff/Empirical-Core into combined-specs