Fixed comment spaces
Fixed testing problems