Migrate tests to use StepVerifier instead of block(). Simplify isUpsert() comparison. Original Pull Request: #325