Address review comment: Less obscure tests.
Address review comment: More info in exceptions.