Added some testing stuff