Add missing tests;
Add todo marks where tests has to be written