Fix people helper test, now onto feature tests
Merge remote-tracking branch 'origin/master'