Fix test system to run also in the host system again