Adds tests to changeset 53282726 (#12337)

Change-Id: Ic6dcd98483feb59942392834deb3db356b17b8ab