Finished relational tests, fixed/changed some more minor things