fix Tests building
add Aaron changes and create a test for it
Merge pull request #10 from nourahassan/master

Added AaronBratcher  Changes From PR #9