fix runtime and tests