and otherwise fixing files and tests to do py.test.skip()s only during setup. --HG-- branch : trunk
--HG-- branch : trunk