Distinguished test for local and travis
Minor corrections