Removed old, unnecessary header file.
Added tests for more relation/full cases, fixed bug where relation inclusion was in the wrong 'direction'.