File manager Unit Test back on

Still testing in TC. Not yet ready for merge.