Hosung feedback fixes

Change-Id: I945015a9c557567d7ed5a49854faba78ffb081f4
Tests improvements

Change-Id: Ia2c87e98366cf6010fae41328a3b258cb8312dfc