Bug fix. Skip properly for snapshots of pools

Updated tests to be more realistic.
Merge branch 'skip_pools_fix'