added some more unit tests