Added acceptance and unit tests.