DC | #0000 | fixing func tests