Moved tests into appropriate subdirs.