Adds a few more unit tests