Add some more unit tests