Use new tests. Ref file reader content
Move it to tray