Fix Failing Tests

All tests are passing on Travis-CI.