reorder tests
set location correctly for completion tests