update tests
Merge branch 'snap-1.0.x'
udpate paths
Merge branch 'snap-1.0.x'