+ More UnitTests (some reorganised/renamed)