Add test module and test for this (#3593)