Updated testing and glue code to account for new erroring behavior