test and tweak snapshot functionality

@czue