Refactor people tests
refactor Retainers tests
Refactor Contract tests