Add corresponding regression test. Part of P113-046. Change-Id: Ie2c466a841743e0bee59ee4c86dccf2aca31ae09