Added some more testing