Fewer failing tests

There are still tests failing, but this change addresses some of the new failures after 4b163e04826236ad37baa591bca6c381f60c7c85 (which is an awesome improvement despite the test failures :).