cleanup/catchingup/testing
some cleanup; start to py.test revision