Add some debug prints to check XTAF vs invocation
Change XTAF partition detection into a simpler loop