Added back test folder... somehow, it was lost during the rebase