Added automated unit test