Address review comment: Make tests less obscure.
Address review comment: Test what we claim to be testing.