adding new keywords for users and groups
adding acceptance tests