removed old code
tests
Merge branch 'c/feature/#84' into Clownfish