Fix over 100 more failing specs

With these changes my machine's interpreted test results are now:

Tests run: 11585, Failures: 8, Errors: 42, Skipped: 3