Runnable tests

I will add more info why the changes in code comments.