Setting up files
Updating test case
Keeping it DRY