DRY up tests a bit