Unit tests

Change-Id: If3054b211b04c07ea6c14a402750ad945403af22