More testtols -> unittest2
Until @winjer fixes the parser
Until secrets are back
We fixed this upstream, so remove work around