Made changes and additions to locations and added test folders