update format of ng-option expression
update test for new expression