Adds more unit tests