Added some more testing stuff