Unit tests 2

Change-Id: I039f1b809e62fe8293c3de15c7c164d9df9bbbaa