Magic-number limination. Improve test coverage.