Added unit tests to get 100% coverage for heat version Change-Id: I7e4d7635e4c7d394d1c02facf940f2d59bee55c8