Bug Fix Description: The RUNSERIAL and RUNPARALLEL macros weren't needed in the C++ stuff and were messing up some of the testing. Solution: Removed them. Platforms tested: Linux