Fixed some test