Refactoring tests, to be more readable.