Move tests to subdirectory
Fix CPython 2.5 compatibility
Present test input in more reasonable way