fixed utest, update formatting added comments