CFY-1325 modify some tests to use inputs when possible