change no snapshot to 21
changes for new rules v13 and test work again except one (not severe)