Merge "Use more specific asserts in tests"