Fixed up the tests

Change-Id: Ie8dddb4276da276fb787c64bf698d8456cfd0a42