Added tests for bug-1367470

Change-Id: If862b4c412f031cfaf6e4bb4245930d0ce1a532e
Related-Bug: #1367470