Modified test such that it takes the OS into account
Changed tests w.r.t. OS