Add keywords
More descriptive failures for test