fix standalone run and tests