Changed many test cases for mac - need to be tested on other systems