Updated tests to work (hopefully) across platforms