Improced unit testing by adding an XML config, test suites and the appropriate restructuring