Removed blankline.
Py3k friendly.
Uncommented tests.