Adding more of a testing framework
Better use of ConfigParse
PEP8ed