fixed issue cat-780

fixed behaviour except android-back-button

adapted tests