Fix import grouping in tests

Fix some import statements based on comments left on
https://review.openstack.org/#/c/92681/5

Change-Id: Ied2f65ae2f04e2b17632b860008b785e30e7638c