Qoute the join constraint
Fixed tests