Modified Program for Test suitability and added tests
Merge pull request #4 from mrubel92/new-program-structure

Modified Program for Test suitability and added tests