Implemented FORGE-1254 and Unit Test
remove renamed test