initial regression test and refactored the topology interface

I moved the const back to right after import. But I would like to keep this naming change as it is import for our small team to move forward instead of focus too much on formality.