removing comments; updated tests