Stop passing context into relate and add relation tests