refactor spec refs #483