Commented things out properly
Fixed ++ test properly