Remove class-type.
Fix str method.
Simplify class type.
Split tests into two modules.