Cleaning tests and improving maven usage