Const definition reformatted.
Cleanup tests.