Updating tests, errors