DC | #0000 | Fixing Func tests