Use __unicode__ not __str__ just yet
Change test structure
Add test template