Fix IDE-1489

Greg review comment updates, UT cases and sample projects added