Fix multi table joins error and add more integration tests

Fix multi table joins error and add more integration tests #3147