Updated tests to reflect change to filefortest
Altered name of iteration number test so it runs
Various minor odifications