remove commented code
add basic Relation unit test