Made several more unit tests