Fixed people tests
More angularification