Changed incorrect comments in code. Added unit tests.