Refactoring
Fixing tests for adding suitor/reviewer