Updated wording and structure of tests