move developer_mode tests into their own block

This should make it clearer that the developer_mode is a special
case. It will also make it easier to remove if we decide to abandon
developer_mode in the future.

Change-Id: I989971c193b73481fea45853e94f0442e476374b