fixing the remarks and adding a test (though it doesnt test much yet) for the org entities. also changed the lookup to look for just entities and not for person/blah.