IN-563 Fix specs and change test to new scenarios