Add more tests for validating closing of bug #1640517

Change-Id: I5c3f231d3294752e0d6dbd5658b07c64b69b5c8d
2 files changed