yet more unit tests ...