Fixes to pass tests and change how relation status is handled.