DSA-58: added tests and changed view flow