Re-organizing the Python code and modularizing it
Adding 2 more tests to the unit testing system.