Tweaks test code
Merge pull request #32 from watilde/tweaks-test

Tweaks test code