Small tweaks to make local tests running with vagrant