Latest mods and simple unit-tests committed.