Added role classes and tests