Added some other testing stuff