Stub testing made consistently

Soon will be ready to extend the testing also with files :)
Merge branch 'feature-finalizing-dummy' into develop