Some more unit tests