kim added files unit and acceptance tests