Directional relationship bugfix

Hi there,

Just a couple of small bugfixes for some issues we noticed.  Nothing major: just a few tests that could be better isolated, and a bug in directional relationships where the relationship is one-to-one (which doesn't happen at the moment anyway, but could one day)

Thanks,
Mark