Test fix

Tests are still broken, but at least they are actually failing now, instead of just erroring out.