And some more unit tests