Update UnitTests structure. Fix AbbreviatedPresenceTest.