TEST: Try to fix py.test issues