Move more tests into appropriate subdirs.