unit test update

update of unit tests.  LocationCOntroller test set to ignore pending
additional code on that set.
Needed: integ tests for Enterprise (S