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