More fixes for toolchain script, disabled tests