Put tests into the appropriate files. Fixed _request semantics