Fix some missing edges, add test coverage.