Added testing feature