Cross-platform compatibility plus test reorganization

I made the tests cross-platform aware (some time ago) and now have reorganized the test files to be aligned on the same project. Basically just a little housekeeping.