Merge fix: Move tests to website folders