refactored usa tank datafixtures