[#61] Correct mistakes, added additional tests