Resolved issues in presenter, marked functions as private
Updated tests
Removed tests for newly private functions