start trying to ass more Tests, a little bit more fine-grained,  WIP
Merge pull request #3 from D10221/dev

start trying to ass more Tests, a little bit more fine-grained,  WIP