Fix a ton of tests, bring build back to green

Tests weren't maintained after forking from calagator.  Tried to clean up the failing tests the best I could given the time available.  Before changes from this pull request are applied:

```
588 examples, 169 failures, 9 pending
```

After applying changes from this pull request you should see:
```
590 examples, 0 failures, 9 pending
```