Made tests less reliant on file paths

Some small edits to make tests less reliant on exact file paths. I've discovered recently that these are not necessarily consistent across different systems and that relying on them being exactly the same makes the tests too brittle.