REFACTOR: Included topology input in some tests