Navigation marker is retained when writing out the file
Cleaned up mock test a bit