Make r2s_step2setup.py executable
Wrote tests for r2s_step2setup.py, + more refactoring.
Comments and formatting