Fix some tests for edge