Clean tests a bit
Upgrade maven plugins