Add call-gc test. Update code.