Fixed #__VA_ARGS__, moved cpp tests (cpp is still not tokenised/hacky)