Modified  some methods a bit and added a couple of tests
Added snapshot files into settings.yaml

Change-Id: Id1a53503483c85e4effbed3ada180c787f686eb1