Refactored unit tests.
Removed extension method for Expect.