Some more unit testing