Refactored tests in a more academic style