Added Map tests.
Removed unused imports.
Adding Joda-Time tests.