Consider Python 2 compatability

My installed Python dist is 3.2 so I did not test against 2 all the time.
Re-organize some tests (and add more)