py.tests
test fixes