Unit tests

Change-Id: I5d4796dc4fc9c5fce353e9726ba5d6b125fb94ca