Fix interpolation
DRY up specs