Addressing reviewer's comments.
Adding acceptance test.

First try.
Fixing acceptance test.
Further fixing acceptance test.