Unit tests refactored/assert methods reordered.