Add a couple tests for moving files to directories and vice versa. One fails