Modified the tests so that they use py.test convention
Merge pull request #1707 from canibanoglu/tests

Modified the tests so that they use py.test convention