Added test files
Fixed some cvector macro expansion problems