Updated test to run on mac & windows again.