Add test for bug

Change-Id: Iff510b109de5f5875748f1a67967fb4e9ca76298