Solved issues with callcc
However, we still need to do some complex tests