tests: Small fixes to eliminate false test failures due to recent changes in the library

Change-Id: I4656809d39d77248bfe9652f173861f80d4cd615