Add test code for #124