More unit test updates. All are now passing.