Driver, snapserve and catalyst init changes to get tests running on Mac