Fix maven deps
Fix tests