Add more tests with runner

Change-Id: If3ccae3bf6b2579267a862d12d6149523fed81cd