Improve parameters management
Fix tests