test fixes and relations