Updating to be more robuse for CI servers. Related to #116, needs testing