Added testing functionality