fix up existing unit tests

Change-Id: Ic36c4140c218f69131aa311addc5e9acfe6fd43a