Fixed the initial and test data, how it is loaded and the displaying of this