added tests
Merge branch 'addingtests'