Attempting a fix to get tests to pass with travis. Very odd...