Unit tests and cleaned up unused constants.