Fix some test errors