Add snapshot tests
Merge origin/master