More tests

Change-Id: I4f7c84658ffd65707d2e29c95d2a5c5c07810a7a