fixing tests
Merge pull request #51 from jereln/jerel-final-edits

fixing tests