fixed tests, updated to new error code, #minor