Unit Test Improvements

Several changes to unit tests to try
to get tests that run successfully on my
system and intermittently fail on TeamCity
build to run.

Change-Id: I54074bb408ac8ab35e939909e13c70d9190d27da