* Remove some unneeded block till done * Additional state check cleanups and snapshots * Use more snapshots in yale tests