DRY up test setup
Clarify test name wording
Use version_number consistently