Create testing structure, improve DataParser