Other tests

Change-Id: I2db69b8da824b43a8c8e5c27b9248cbe2a5df95b