Add -d and -r options like for Emmental; make tests sensible.