Fixing naming issue in some tests that failed Travis.