Readded the CPP test of #if constant and moved the String.Buffer test to the other String.Buffer tests.