Merge "Do not include test folder on user build"