Update other constants and tests