[WIP] Feature/tests2

a rebase version from my PR #1