Better testing class for py.test
Tests all green with Py3k too!