added tests and reduced unnecessary code
Merge branch 'master' of https://github.com/tonycapone/SavvisDemoV2