VID-1953 Make the unit tests fail with a better message

Also fix a warning about matching function prototypes
VID-1953 Spacing change
Merge pull request #4534 from Wikia/VID-1953

VID-1953 Make the unit tests fail with a better message