Updated cdecler and tests