Thanx for the patch! I also added the test data, because without that too many tests will needlessly fail.

Patches: http://git.io/VPL6zQ and http://git.io/pNBs_g