Added Swagger
Fixed unit test