improved local tests