Added py33 tests
Code cleanup
Code cleanup
Code cleanup