Modified local tests