Added some test code and updated classes for python2
Merge branch 'master' of git.bjester:bjester/project-leda