Fix JTA compatibility
Fix tests, joda-time 2.6