Fix persistence issues with tests