Make clean-ns handle macros
bump timeout some more

Saw another spurious test failure on travis earlier today