add some new tests
Merge branch 'dev' of github.com:valiknet18/mychristmas into dev