Fixed some test errors