small modifs to test codes