Rearranged some file-related tests

Just moving around some tests to be more logically grouped.