Yet more unit tests