Finalize transition to COPASutils-based functions
Fix regression code, now works with COPASutils