Start adding tests

Change-Id: Iebe421c12a3e1ad84bc1aaf3d91b3cd5a50aea78