fix reference to constant tfPos
move around files in test directory