Refactor most unit tests using Expect() makes them clearer, simpler and more reliable.

Using Expect() makes them clearer, simpler and more reliable.