Remove motd-tail
Fixup test