More tests and bug fixes

Fixed Unit tests to correctly test for en_GB units
Fixed code in the CLDR module that was incorrectly causing the bug in
the tests above
More tests for display names and a few bug fixes for bugs discovered
while creating these tests