Corrected DrawLayers, fixed most Tank tests