Add testing facilities