More constants
More use of constants
Add another test
Code reorganization all around