Merge pull request #164 from nno/_tent/surfing

more tests in surfing + better PY3k compatibility