Minor refactor on get-tests