Fixing the test folder structure and updating relative paths within tests.