move tests near subjects