Whoops.. add tests back
Merge pull request #48 from tfhartmann/master

Whoops.. add tests back