Refactor specs to use a shared context for the base relation setup
Update flay threshold