Update comments and unittests