refactored tests to use haacked style
Merge pull request #7 from glennblock/dev

refactored tests to use haacked style