Updated unit tests and added acceptance tests.