code and test cleanup.  add constants references instead of hardcoded values