Halfway through C6 - fixed own bug in func tests