DC | #0000 | Fixing func tests