Updates for test data and folder locations