empty tester workspaces
Added C++ support, and some minor changes
Merge branch 'temp'