Merge "Add unit tests for edge extension" into main