unittest back to working

Change-Id: Id6ea5e29b0a6c5c78758caa3e46d1d3a31d171d4