Fixed a few tests and changed Travis-CI to not worry about EV since I have not yet made this non-blocking