More refactoring to clean up the specs