Fix for auto test to pass completely.