Fixed broken unittests and added notes where review is needed.