Clean testing to pass Travis test