adding junit tests
Merge branch 'master' of https://github.com/dmacdo02/TestingTesting123