Issue #257: Clean up People menu items.

Running tests after latest pull/merge
Conflict here needs to be fixed. Is this test even running? Seems like it should have errored-out.