More fixes for keyword-based test