SD-404 : Write more behave tests, especially for error flows
Merge remote-tracking branch 'ioan/master'