rebuilt c++
updated tests