adding test structure
adding tests
Merge branch 'adding_tests'