added test folder and fixed join bug