Moving tests to match OpenStack conventions