With test folder added