added unit tests for main_test.py file
fixed the conflicts for main_test.py