new unit tests

Change-Id: I0317174f880af930f54560262b43bc8530cb6962