Added Unit Tests
Allow config file to passed in
Tweak