Added all testing stuff