Merge pull request #1707 from canibanoglu/tests
authorKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:32:09 +0000 (10:32 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:32:09 +0000 (10:32 -0700)
Modified the tests so that they use py.test convention


Trivial merge