rm template option, since it won't work as well with subdirs
rm unique option, should always be unique
more tests