Working branch/should fix travis

fixed test