Added Acceptance, Unit Tests