Merge "Set up the the unit test folder" into main