Refactored people conversion, modified tests for using the new API