Add test classes

Change-Id: I8e698f3d4bcbaae585b44e68a44e969c3a9fb6f7