Test and Fix for BBGMN-1155