Streamline gate test for core

Change-Id: I6ef6b6c5305e6d145da578d44d4c85b3075a52c2