Fix failing tests

Or, better yet, path.join(). Yes. But I left it as string concatenation because that's what was already there and I prefer consistency! Besides, there are several other places that assume '/' which are also broken on lesser operating systems!