Get unit tests to work

Change-Id: Ie1d2480a5c94cd053da8f0949c4a4ac9bb77a165