This fixes some of the logics which do not actually enable unit tests, to keep appropriate test coverage. Change-Id: I02d7f2a21d0b2a3c09f622caf11041a6dd9d0f83