More Unit Test Updates