adjust spacing in test files, removed unused imports
handle MNC_ZERO correctly