Fix tests to accomodate for multiple OSes