Add unit tests

Change-Id: I49f77e2ef72833e5101720cb6e84183d88591256