Fixed some tests.
Added EMPTY_STRING static obejct.
Converted Long expect to use Long instead of long. Better handling of null values?