couple error reporting/ test updates