Changes to make unit tests pass on Detalion.  Currently six UT's fail.