Added testing mode