Fixes according to unit test
Enhancement #9: Connect flow