updating file for testing branch
Adding tests
Merge branch 'Testing'