Fixing unit tests for previous fix.