Constants tuning
Proper testing