Moved some tests into -type directory.