Cleared up error reporting. One test left to fix.