WE HAVE TEST! and fixed errors