Changed name of unit test folder
Fixed bugs appearing on account of renaming utest-folder