Refactored TestData, LoadHub and Chart classes to fit changes - more todo though

Still slow for some reason..