resolved some test bugs
solved some test errors