Unit testing; test folder fix again