Fix failing test. Undo partial change to NDFileSimulator
Missed off some files needed by adviewer