Cleanup spec. Move error assert into spec_helper