ModelConditionTest_SpiralStairs now handles both square and triangle spiral stairs, removed ModelConditionTest_SpiralStairsTriangle again