Fixing test dependencies
Adding jodatime support
Fixing tests for joda time