Added testing support