Changed test storage location and fixed bug in test cleanup helper.