refactored cn tank datafixtures
refactored fr tank datafixtures