Remove duplicated fixtures

Sort fixtures for better maintainability.

Change-Id: I17d4229584e2df2da2666e00f17bfcacdb8cdd03