Refactoring tests: unifying assertion style