Activated Joins and added functional test

- See comments for questions.