Refactored enum names, and broken line numbers with unittests.