Unit tests

Change-Id: I9a7d538715a767762d86c2e72e7ecb7964e1b641