Make clean-ns handle macros

Also bump timeout some more, I saw another spurious test failure on travis earlier today