updated to unit tests so that they all pass with the recent changes.