Sync working changes to git.
Test case fixes.