-fix rspec issue
-fix ingoing and outgoing relationships