Corrected topology generation and test
Merge branch 'master' of github.com:dww100/bac