Fixed error + added new tests
Corrected old comments