Reorgan 1
Trying to make tests. I think I will never love Python's unittest - terribly overcomplicated.