refactored uk tank datafixtures