Refactored for parameterized tests.
Start-over
--wip--
--wip--
Stable return of cog function array
Resolved merge conflicts
Fixed merge issues.