Adding in new testing file strucutre