Use 'EXPECT_' rather than 'ASSERT_' in unit-tests, where possible.
Merge pull request #326 from caitp/expect-not-assert

Use 'EXPECT_' rather than 'ASSERT_' in unit-tests, where possible.