Changed testing file structure