Refactored Committer. Added tests