Fix tests to eliminated unexpected failures