Added testing stuff