Renumber box request ids from 0 to 6 in 1.6.

Introduce constants for ids. Update tests.