file moves
Tidy up test
twoLeg Test
reorg