failing test fixes, adding switch for ctool