Added some testing stuff..