add more tests
refacoring
one more test
Merge branch 'testing'