FIX: Fix tests
Merge pull request #1465 from Eric89GXL/fix-tests

FIX: Fix tests