updated file and correct some test errors