simplified tests and added new Join that is not yet tested