Add testing support