Add ability to test issue 2680