Jim's fixes for keyword-based test