Fixed issue with test suite names

Change-Id: Ic9f6551877e33fb673e13906a1cb9ad24eef945b