#321 Integration test was upgraded to cover main use case