Using @Ignore instead of commenting out

Change-Id: Ia9f9fb519c1b6c0c6f78ef32f56df9a153f930e5