removed deprecated variables, added swift client role, added configurable test user"