[WIP] fixed all failed Travis tests. Waiting for verified.