File movement
Some more unit testing