Get most of the tests passing again

@kdkeck do the tests work for you with / without this change?