Unit tests

Change-Id: Icdff2c8d23176c17e662aa3ecc593a599b7442c6