Fixing a few test ambiguities that caused failures for Travis