Minor changes for local tests