Use new container based infrastructure for tests