Closed #6 added count method and cleaned up unit tests