[BUGFIX] Fix failing tests caused by static_info_tables

Change-Id: If1762ba97e25b46063c447572757fcf610673237