Move test location to top level