Added some more testing and some additional pet functions