Add testing support with