unit tests adaptations, new tests added