Added several more unit tests