Fixed some comments in the core, completed test rig for core functions