Added improved preprocessor include tests and also changed the format of the includes.
simplified preprocessor parser.
Merge origin/master