Remove some unneeded constants and add some simple test programs.