added tests..
Merge branch 'adding-tests'