Added disconnect
Merge branch 'development' into protocol-tests
Added disconnect test