Move tests off request