Adding extra testing functionality