Moved some extend tests into more specific directories.