small modifications on test codes