Fix test-<func-name> to test
Corrected test versions for late submission