Fixed build process to accomodate testcpp