FIX: Fix tests
STY: Minor tweak
Merge pull request #385 from Eric89GXL/fix-tests

FIX: Make testing slightly cleaner