Brought spec file up to speed