#20 is totally fixed + new tests