Indraneel. Bharti| #527| Adding notes/comments to diagnosis
Indraneel, Bharti| #527| Fixing and writing integration test