Add spec/helpers and update tests