Import tests from SVN repository r821

Drop history intentionally
Add subdirectory unconditionally