Add testing features