Extra comments removed
Unit test code updated