Merge "Move tests to align with tested classes" into main