Fix Failing Tests on Travis-Ci