Adding some more testing stuff