DEMO-13 #In Progress testing #comment fixed